From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 13 Apr 2022 18:51:55 +0000 (+0200)
Subject: background: Do not queue idle when cancelled
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~480^2^2~36
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ef74f922d65d38718b5d8cb13bc43f129947ffc0;p=gnome-shell.git

background: Do not queue idle when cancelled

A cancelled cancellable means that the background was destroyed,
so we shouldn't queue an idle or emit the 'loaded' signal anymore.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5337

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2268>
---

diff --git a/js/ui/background.js b/js/ui/background.js
index 825fee0d9..a68f23301 100644
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -333,6 +333,8 @@ var Background = GObject.registerClass({
             return;
 
         this.isLoaded = true;
+        if (this._cancellable?.is_cancelled())
+            return;
 
         let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
             this.emit('loaded');